CET-workarround for gpx files removed. "encoding=UTF-8" for gpx format is standard...

diff --git a/gpsbabel/reference/coastexp.ref b/gpsbabel/reference/coastexp.ref
index 492e32f3e634b40b5eeca8f914feb512ff2c1b61..de4fac5997d16a20c7916adfbb90d0dcb1bc8804 100755 (executable)
--- a/gpsbabel/reference/coastexp.ref
+++ b/gpsbabel/reference/coastexp.ref
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/coastexp.ref3 b/gpsbabel/reference/coastexp.ref3
index 9c32e367836034225d2c5eff36816fbe020a175c..ae02d82d8e023cf6fa3430d5f7756a5ffb8d11f5 100644 (file)
--- a/gpsbabel/reference/coastexp.ref3
+++ b/gpsbabel/reference/coastexp.ref3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/igc1.gpx b/gpsbabel/reference/igc1.gpx
index 63e3ef55d200f30a1d23b071a705b344b88880bc..8dacba50df87f3f170bf2286a5831731b494beb0 100644 (file)
--- a/gpsbabel/reference/igc1.gpx
+++ b/gpsbabel/reference/igc1.gpx
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/igc1_gpx.out b/gpsbabel/reference/igc1_gpx.out
index 12c7d967d7341399e9583846c3dd3f5f53d7432e..43448b997e9e158bd9adc134df10637e03b9439f 100644 (file)
--- a/gpsbabel/reference/igc1_gpx.out
+++ b/gpsbabel/reference/igc1_gpx.out
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/igc2_gpx.out b/gpsbabel/reference/igc2_gpx.out
index 3b724ea1128a008f75152f925a8da0351b7c803a..df34daebfe4b08ddaed63b509494d3db51da6b08 100644 (file)
--- a/gpsbabel/reference/igc2_gpx.out
+++ b/gpsbabel/reference/igc2_gpx.out
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/route/bcr-sample.gpx b/gpsbabel/reference/route/bcr-sample.gpx
index eb4d8b21e22f6361a7b2849714544bef7239d1f1..7f1983fa9bfb0ab80dad04537d3d6e9866133fcc 100644 (file)
--- a/gpsbabel/reference/route/bcr-sample.gpx
+++ b/gpsbabel/reference/route/bcr-sample.gpx
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/track/pathaway.gpx b/gpsbabel/reference/track/pathaway.gpx
index dcad06f9fbb2f31f78df298222cbe451253575a0..cd107daf43334e00a67328ed7f7ffd6e648b72a6 100644 (file)
--- a/gpsbabel/reference/track/pathaway.gpx
+++ b/gpsbabel/reference/track/pathaway.gpx
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/track/vitosmt_t.gpx b/gpsbabel/reference/track/vitosmt_t.gpx
index ff68ffa68826b2758293a58acbd0917a01d34185..afd743566ef72c2a726a68e9a0b76f1f07fbf55c 100644 (file)
--- a/gpsbabel/reference/track/vitosmt_t.gpx
+++ b/gpsbabel/reference/track/vitosmt_t.gpx
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/reference/vitosmt.gpx b/gpsbabel/reference/vitosmt.gpx
index 543661ff65237d4c97432888043a8e06cc2dfbfe..e2035e65d4b6a667df1702fb36e443164d01f755 100644 (file)
--- a/gpsbabel/reference/vitosmt.gpx
+++ b/gpsbabel/reference/vitosmt.gpx
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gpx
  version="1.0"
 creator="GPSBabel - http://www.gpsbabel.org"

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 68c26feb1a3596989d95d9e886880a68384f1cfb..9295e60103d75ab1fe099f7350825d737aa7ff2c 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -36,13 +36,6 @@ sort_and_compare()
        compare $TMPDIR/s1 $TMPDIR/s2
 }
 
-compare_gpx()
-{
-       sed -e '1d' $1 > $TMPDIR/comp_gpx1
-       sed -e '1d' $2 > $TMPDIR/comp_gpx2
-       compare $TMPDIR/comp_gpx1 $TMPDIR/comp_gpx2
-}
-
 # Some formats are just too boring to test.   The ones that
 # are xcsv include 
 # garmin301 
@@ -456,11 +449,11 @@ compare ${TMPDIR}/navi.wpt reference/navicache.ref
 #
 # CoastalExplorer..
 ${PNAME} -r -i coastexp -f reference/coastexp.nob -o gpx -F ${TMPDIR}/coastexp.gpx
-compare_gpx ${TMPDIR}/coastexp.gpx reference/coastexp.ref
+compare ${TMPDIR}/coastexp.gpx reference/coastexp.ref
 ${PNAME} -r -i gpx -f ${TMPDIR}/coastexp.gpx -o coastexp -F ${TMPDIR}/coastexp.nob
 compare ${TMPDIR}/coastexp.nob reference/coastexp.ref2
 ${PNAME} -w -i coastexp -f reference/coastexp.nob -o gpx -F ${TMPDIR}/coastexp.gpx
-compare_gpx ${TMPDIR}/coastexp.gpx reference/coastexp.ref3
+compare ${TMPDIR}/coastexp.gpx reference/coastexp.ref3
 ${PNAME} -w -i gpx -f ${TMPDIR}/coastexp.gpx -o coastexp -F ${TMPDIR}/coastexp.nob
 compare ${TMPDIR}/coastexp.nob reference/coastexp.ref4
 #
@@ -602,7 +595,7 @@ sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_se
 compare ${TMPDIR}/igc_sed.out reference/igc1_igc.out
 
 ${PNAME} -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
-compare_gpx ${TMPDIR}/igc.gpx reference/igc1_gpx.out
+compare ${TMPDIR}/igc.gpx reference/igc1_gpx.out
 
 ${PNAME} -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
 sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
@@ -614,14 +607,14 @@ compare ${TMPDIR}/igc_sed.out reference/igc1_3d.out
 
 
 ${PNAME} -i igc -f reference/igc2.igc -o gpx -F ${TMPDIR}/igc.gpx
-compare_gpx ${TMPDIR}/igc.gpx reference/igc2_gpx.out
+compare ${TMPDIR}/igc.gpx reference/igc2_gpx.out
 
 ${PNAME} -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
 sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
 compare ${TMPDIR}/igc_sed.out reference/igc2_igc.out
 
 ${PNAME} -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
-compare_gpx ${TMPDIR}/igc.gpx reference/igc2_gpx.out
+compare ${TMPDIR}/igc.gpx reference/igc2_gpx.out
 
 #
 # Google Maps XML test
@@ -745,7 +738,7 @@ ${PNAME} -i pathaway -f ${TMPDIR}/pathaway-geo.pdb -o geo -F ${TMPDIR}/pathaway-
 compare ${TMPDIR}/pathaway-geo.loc reference/pathaway-geo.loc
 rm -f ${TMPDIR}/pathaway*
 ${PNAME} -t -i pathaway -f reference/track/pathaway.pdb -o gpx -F ${TMPDIR}/pathaway.gpx
-compare_gpx ${TMPDIR}/pathaway.gpx reference/track/pathaway.gpx
+compare ${TMPDIR}/pathaway.gpx reference/track/pathaway.gpx
 
 #
 # Garmin GPS Database .gdb tests
@@ -766,9 +759,9 @@ ${PNAME} -w -r -t -i gdb -f ${TMPDIR}/gdb-sample.gdb -o gpx -F ${TMPDIR}/gdb-sam
 #
 rm -f ${TMPDIR}/vitosmt*
 ${PNAME}    -i vitosmt -f reference/vitosmt.smt -o gpx -F ${TMPDIR}/vitosmt.gpx
-compare_gpx ${TMPDIR}/vitosmt.gpx reference/vitosmt.gpx
+compare ${TMPDIR}/vitosmt.gpx reference/vitosmt.gpx
 ${PNAME} -t -i vitosmt -f reference/vitosmt.smt -o gpx -F ${TMPDIR}/vitosmt_t.gpx
-compare_gpx ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx
+compare ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx
 
 #
 # tracks filter tests
@@ -777,18 +770,18 @@ compare_gpx ${TMPDIR}/vitosmt_t.gpx reference/track/vitosmt_t.gpx
 rm -f ${TMPDIR}/trackfilter*
 
 ${PNAME} -t -i gpx -f reference/track/trackfilter.gpx -x track,pack,split,title="LOG-%Y%m%d" -o gpx -F ${TMPDIR}/trackfilter.gpx
-compare_gpx ${TMPDIR}/trackfilter.gpx reference/track/trackfilter.gpx
+compare ${TMPDIR}/trackfilter.gpx reference/track/trackfilter.gpx
 
 #
 # Map&Guide Motorrad Routenplaner .bcr files test
 #
 rm -f ${TMPDIR}/bcr*
 ${PNAME} -r -i bcr -f reference/route/bcr-sample.bcr -o gpx -F ${TMPDIR}/bcr-sample.gpx
-compare_gpx ${TMPDIR}/bcr-sample.gpx reference/route/bcr-sample.gpx 
+compare ${TMPDIR}/bcr-sample.gpx reference/route/bcr-sample.gpx 
 ${PNAME} -r -i gpx -f reference/route/bcr-sample.gpx -o bcr -F ${TMPDIR}/bcr-sample2.bcr
 compare reference/route/bcr-sample2.bcr ${TMPDIR}/bcr-sample2.bcr
 ${PNAME} -r -i bcr -f ${TMPDIR}/bcr-sample2.bcr -o gpx -F ${TMPDIR}/bcr-sample2.gpx
-compare_gpx reference/route/bcr-sample.gpx ${TMPDIR}/bcr-sample2.gpx
+compare        reference/route/bcr-sample.gpx ${TMPDIR}/bcr-sample2.gpx
 
 #
 # cet - Character encoding transformation tests